[beta] backport rollup #65708

Mark-Simulacrum · 2019-10-22T21:12:35Z

This includes a bunch of PRs:

Fix redundant semicolon lint interaction with proc macro attributes Fix redundant semicolon lint interaction with proc macro attributes #64387
Upgrade async/await to "used" keywords. Upgrade async/await to "used" keywords. #64875
syntax: fix dropping of attribute on first param of non-method assocated fn syntax: fix dropping of attribute on first param of non-method assocated fn #64894
async/await: improve not-send errors async/await: improve not-send errors #64895
Silence unreachable code lint from await desugaring Silence unreachable code lint from await desugaring #64930
Always mark rust and rust-call abi's as unwind Always mark rust and rust-call abi's as unwind #65020
Account for macro invocation in let mut $pat diagnostic. Account for macro invocation in let mut $pat diagnostic. #65123
Ensure that associated async fns have unique fresh param names Ensure that associated async fns have unique fresh param names #65142
Add troubleshooting section to PGO chapter in rustc book. Add troubleshooting section to PGO chapter in rustc book. #65402
Upgrade GCC to 8.3.0, glibc to 1.17.0 and crosstool-ng to 1.24.0 for dist-armv7-linux Upgrade GCC to 8.3.0, glibc to 1.17.0 and crosstool-ng to 1.24.0 for dist-armv7-linux #65302
Optimize try_expand_impl_trait_type Optimize try_expand_impl_trait_type #65293
use precalculated dominators in explain_borrow use precalculated dominators in explain_borrow #65172
Fix ICE ICE while compiling hyper (StableHasher: unexpected region '_#0r) #64964 Fix ICE #64964 #64989
[beta] Revert "Auto merge of Normalize newlines when loading files #62948 - matklad:failable-file-loading, r=petro… [beta] Revert "Auto merge of #62948 - matklad:failable-file-loading, r=petro… #65273
save-analysis: Don't ICE when resolving qualified type paths in struct members save-analysis: Don't ICE when resolving qualified type paths in struct members #65353
save-analysis: Nest tables when processing impl block definitions save-analysis: Nest tables when processing impl block definitions #65511
Avoid ICE when checking Destination of break inside a closure Avoid ICE when checking Destination of break inside a closure #65518
Avoid ICE when adjusting bad self ty Avoid ICE when adjusting bad self ty #65755
workaround msys2 bug workaround msys2 bug #65762

@alexcrichton

…crichton Upgrade GCC to 8.3.0, glibc to 1.17.0 and crosstool-ng to 1.24.0 for dist-armv7-linux rust-lang#62896 was caused by the usage of the GCC 5.2.0 toolchain, which was released back in 2015 and may have bugs affecting LLVM 9. This PR upgrade GCC to 8.3.0 from 5.2.0, glibc from 1.16.0 to 1.17.0 and crosstool-ng to 1.24.0 only for dist-armv7-linux. Fixes rust-lang#62896 r? @alexcrichton

This looks like the only place calculating dominators from the MIR body every time instead of using the ones stored on the `MirBorrowckCtxt`. For example, in rust-lang#65131 a big generated function with a number of borrowck errors takes a few hours(!) recalculating the dominators while explaining the errors. I don't know enough about this part of rustc codebase to know for sure that this change is correct, but no tests seem to fail as a result of this change in local testing.

@gnzlbg

…king-rust-abi-unwind-issue-64655, r=alexcrichton Always mark rust and rust-call abi's as unwind PR rust-lang#63909 identified a bug that had been injected by PR rust-lang#55982. As discussed on rust-lang#64655 (comment) , we started marking extern items as nounwind, *even* extern items that said they were using "Rust" or "rust-call" ABI. This is a more targeted variant of PR rust-lang#63909 that fixes the above bug. Fix rust-lang#64655 ---- I personally suspect we will want PR rust-lang#63909 to land in the long-term But: * it is not certain that PR rust-lang#63909 *will* land, * more importantly, PR rust-lang#63909 almost certainly will not be backported to beta/stable. The identified bug was more severe than I think anyone realized (apart from perhaps @gnzlbg, as noted [here](rust-lang#63909 (comment))). Thus, I was motivated to write this PR, which fixes *just* the issue with extern rust/rust-call functions, and deliberately avoids injecting further deviation from current behavior (you can see further notes on this in the comments of the code added here).

This commit silences the unreachable code lint when it originates from within a await desugaring. Signed-off-by: David Wood <david@davidtw.co>

Mark-Simulacrum · 2019-10-23T13:32:40Z

r? @pietroalbini

pietroalbini · 2019-10-23T16:42:36Z

@bors r+ p=8

bors · 2019-10-23T16:42:38Z

📌 Commit c38b91c has been approved by pietroalbini

pietroalbini · 2019-10-23T16:42:45Z

@bors rollup=never just in case

bors · 2019-10-23T19:01:24Z

⌛ Testing commit c38b91c with merge 56a72c3ed96447a73df0b06a5507ada48edf6a66...

rust-highfive · 2019-10-23T19:04:30Z

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2019-10-23T19:02:05.4435345Z ##[section]Starting: Windows dist-i686-msvc
2019-10-23T19:02:05.6221903Z ##[section]Starting: Initialize job
2019-10-23T19:02:05.6222152Z Agent name: 'Azure Pipelines 6'
2019-10-23T19:02:05.6222258Z Agent machine name: 'fv-az433'
2019-10-23T19:02:05.6222322Z Current agent version: '2.159.2'
2019-10-23T19:02:05.6237142Z Agent running as: 'VssAdministrator'
2019-10-23T19:02:05.6650315Z Set build variables.
2019-10-23T19:02:05.6689112Z Download all required tasks.
2019-10-23T19:02:05.6825813Z Downloading task: Bash (3.159.3)
2019-10-23T19:02:06.7211306Z Downloading task: CmdLine (2.151.2)
---
2019-10-23T19:03:04.8270998Z  15  331M   15 49.8M    0     0  13.0M      0  0:00:25  0:00:03  0:00:22 13.0M
2019-10-23T19:03:05.8154392Z  17  331M   17 57.4M    0     0  11.9M      0  0:00:27  0:00:04  0:00:23 11.9M
2019-10-23T19:03:06.5420878Z  19  331M   19 65.0M    0     0  11.2M      0  0:00:29  0:00:05  0:00:24 12.9M
2019-10-23T19:03:06.5442784Z  20  331M   20 68.6M    0     0  10.5M      0  0:00:31  0:00:06  0:00:25 11.0M
2019-10-23T19:03:06.5443077Z curl: (56) OpenSSL SSL_read: error:1408F119:SSL routines:ssl3_get_record:decryption failed or bad record mac, errno 0
2019-10-23T19:03:06.5462315Z 
2019-10-23T19:03:06.5462635Z gzip: stdin: unexpected end of file
2019-10-23T19:03:06.5488086Z tar: Unexpected EOF in archive
2019-10-23T19:03:06.5488229Z tar: Unexpected EOF in archive
2019-10-23T19:03:06.5488317Z tar: Error is not recoverable: exiting now
2019-10-23T19:03:06.5522473Z 
2019-10-23T19:03:06.5613424Z ##[error]Bash exited with code '2'.
2019-10-23T19:03:06.5851403Z ##[section]Starting: Upload CPU usage statistics
2019-10-23T19:03:06.5952967Z ==============================================================================
2019-10-23T19:03:06.5953054Z Task         : Bash
2019-10-23T19:03:06.5953115Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-10-23T19:03:06.8943669Z ========================== Starting Command Output ===========================
2019-10-23T19:03:06.8948883Z [command]"C:\Program Files\Git\bin\bash.exe" --noprofile --norc /d/a/_temp/ffaaba8f-ddaf-445d-88ed-e636ac3795f8.sh
2019-10-23T19:03:06.9373335Z /d/a/_temp/ffaaba8f-ddaf-445d-88ed-e636ac3795f8.sh: line 1: aws: command not found
2019-10-23T19:03:06.9401417Z 
2019-10-23T19:03:06.9421394Z ##[error]Bash exited with code '127'.
2019-10-23T19:03:06.9493021Z ##[section]Starting: Checkout
2019-10-23T19:03:06.9592266Z ==============================================================================
2019-10-23T19:03:06.9592349Z Task         : Get sources
2019-10-23T19:03:06.9592442Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2019-10-23T19:04:46Z

💔 Test failed - checks-azure

Mark-Simulacrum · 2019-10-23T19:19:37Z

@bors retry network failure

bors · 2019-10-24T07:16:11Z

⌛ Testing commit c38b91c with merge f845822d08d5519fc59792140ad25d00936ad8e5...

bors · 2019-10-24T07:26:55Z

💔 Test failed - checks-azure

Co-Authored-By: Pietro Albini <pietro@pietroalbini.org>

…, r=petrochenkov" This reverts commit ef1ecbe, reversing changes made to fc8765d. That changed unfortunately broke rustfix on windows: rust-lang/rustfix#176 Specifically, what ef1ecbe did was to enforce normalization of \r\n to \n at file loading time, similarly to how we deal with Byte Order Mark. Normalization changes raw offsets in files, which are exposed via `--error-format=json`, and used by rusfix. The proper solution here (which also handles the latent case with BOM) is rust-lang#65074 However, since it's somewhat involved, and we are time sensitive, we prefer to revert the original change on beta.

Mark-Simulacrum · 2019-10-26T00:31:13Z

@bors r=pietroalbini

bors · 2019-10-26T00:31:14Z

📌 Commit 4aa1e7a has been approved by pietroalbini

bors · 2019-10-26T03:49:44Z

⌛ Testing commit 4aa1e7a with merge a208771ff518647d885c9529e3cfac0a26ed3d10...

rust-highfive · 2019-10-26T03:54:22Z

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2019-10-26T03:52:40.7384593Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-10-26T03:52:40.7384688Z  See the log for details (C:\ProgramData\chocolatey\logs\chocolatey.log).
2019-10-26T03:52:40.7388736Z 
2019-10-26T03:52:40.7393486Z Failures
2019-10-26T03:52:40.7400987Z  - msys2 (exited 1) - msys2 not installed. An error occurred during installation:
2019-10-26T03:52:40.7401129Z  The remote server returned an error: (503) Server Unavailable. Service Unavailable
2019-10-26T03:52:41.1981873Z 
2019-10-26T03:52:41.2064471Z ##[error]Bash exited with code '1'.
2019-10-26T03:52:41.2283274Z ##[section]Starting: Upload CPU usage statistics
2019-10-26T03:52:41.2393546Z ==============================================================================
2019-10-26T03:52:41.2393628Z Task         : Bash
2019-10-26T03:52:41.2393703Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-10-26T03:52:41.5314380Z ========================== Starting Command Output ===========================
2019-10-26T03:52:41.5320254Z [command]"C:\Program Files\Git\bin\bash.exe" --noprofile --norc /d/a/_temp/6b7c7940-ffcc-428b-86fc-ff07ed9783b8.sh
2019-10-26T03:52:41.5741208Z /d/a/_temp/6b7c7940-ffcc-428b-86fc-ff07ed9783b8.sh: line 1: aws: command not found
2019-10-26T03:52:41.5789920Z 
2019-10-26T03:52:41.5806332Z ##[error]Bash exited with code '127'.
2019-10-26T03:52:41.5879385Z ##[section]Starting: Checkout
2019-10-26T03:52:41.5981583Z ==============================================================================
2019-10-26T03:52:41.5981683Z Task         : Get sources
2019-10-26T03:52:41.5981796Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2019-10-26T03:54:38Z

💔 Test failed - checks-azure

kennytm · 2019-10-26T11:16:55Z

@bors retry

2019-10-26T03:52:40.7401129Z  The remote server returned an error: (503) Server Unavailable. Service Unavailable

bors · 2019-10-26T12:33:10Z

⌛ Testing commit 4aa1e7a with merge 23f8f65...

[beta] backport rollup This includes a bunch of PRs: * Fix redundant semicolon lint interaction with proc macro attributes #64387 * Upgrade async/await to "used" keywords. #64875 * syntax: fix dropping of attribute on first param of non-method assocated fn #64894 * async/await: improve not-send errors #64895 * Silence unreachable code lint from await desugaring #64930 * Always mark rust and rust-call abi's as unwind #65020 * Account for macro invocation in `let mut $pat` diagnostic. #65123 * Ensure that associated `async fn`s have unique fresh param names #65142 * Add troubleshooting section to PGO chapter in rustc book. #65402 * Upgrade GCC to 8.3.0, glibc to 1.17.0 and crosstool-ng to 1.24.0 for dist-armv7-linux #65302 * Optimize `try_expand_impl_trait_type` #65293 * use precalculated dominators in explain_borrow #65172 * Fix ICE #64964 #64989 * [beta] Revert "Auto merge of #62948 - matklad:failable-file-loading, r=petro… #65273 * save-analysis: Don't ICE when resolving qualified type paths in struct members #65353 * save-analysis: Nest tables when processing impl block definitions #65511 * Avoid ICE when checking `Destination` of `break` inside a closure #65518 * Avoid ICE when adjusting bad self ty #65755 * workaround msys2 bug #65762

bors · 2019-10-26T16:14:09Z

☀️ Test successful - checks-azure
Approved by: pietroalbini
Pushing 23f8f65 to beta...

michaelwoerister and others added 9 commits October 22, 2019 16:59

Add troubleshooting section to PGO chapter in rustc book.

d45ca22

Add expanded type cache to OpaqueTypeExpander

36ef9d7

Only expand types that contain projections

e9978cf

Ensure that associated async fns have unique fresh param names

42c5024

Account for macro invocation in let mut $pat diagnostic.

2b88722

typeck: silence unreachable code from await

da27cc9

This commit silences the unreachable code lint when it originates from within a await desugaring. Signed-off-by: David Wood <david@davidtw.co>

Mark-Simulacrum added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 22, 2019

rust-highfive assigned pietroalbini Oct 23, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 23, 2019

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 23, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 23, 2019

Centril added the rollup A PR which is a rollup label Oct 24, 2019

sinkuu and others added 11 commits October 25, 2019 20:29

Do not collect to vec for debug output

f7b45be

Pacify tidy

de58c33

workaround msys2 bug

336464a

Co-Authored-By: Pietro Albini <pietro@pietroalbini.org>

Use empty typeck tables when nesting on items without those

6bd9305

Test an assoc. type in struct member def inside fn

f17c36e

Nest typeck tables when processing struct member types

6b753f6

save-analysis: Nest tables when processing impl items

b561cd1

save-analysis: Add a relevant test case

da12236

Avoid ICE when checking Destination of break inside a closure

4377d2e

Avoid ICE when adjusting bad self ty

4aa1e7a

Mark-Simulacrum force-pushed the beta-backports branch from d685e25 to 4aa1e7a Compare October 26, 2019 00:30

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 26, 2019

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 26, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 26, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 26, 2019

bors merged commit 4aa1e7a into rust-lang:beta Oct 26, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[beta] backport rollup #65708

[beta] backport rollup #65708

Mark-Simulacrum commented Oct 22, 2019 •

edited

Loading

Mark-Simulacrum commented Oct 23, 2019

pietroalbini commented Oct 23, 2019

bors commented Oct 23, 2019

pietroalbini commented Oct 23, 2019

bors commented Oct 23, 2019

rust-highfive commented Oct 23, 2019

bors commented Oct 23, 2019

Mark-Simulacrum commented Oct 23, 2019

bors commented Oct 24, 2019

bors commented Oct 24, 2019

Mark-Simulacrum commented Oct 26, 2019

bors commented Oct 26, 2019

bors commented Oct 26, 2019

rust-highfive commented Oct 26, 2019

bors commented Oct 26, 2019

kennytm commented Oct 26, 2019

bors commented Oct 26, 2019

bors commented Oct 26, 2019

[beta] backport rollup #65708

[beta] backport rollup #65708

Conversation

Mark-Simulacrum commented Oct 22, 2019 • edited Loading

Mark-Simulacrum commented Oct 23, 2019

pietroalbini commented Oct 23, 2019

bors commented Oct 23, 2019

pietroalbini commented Oct 23, 2019

bors commented Oct 23, 2019

rust-highfive commented Oct 23, 2019

bors commented Oct 23, 2019

Mark-Simulacrum commented Oct 23, 2019

bors commented Oct 24, 2019

bors commented Oct 24, 2019

Mark-Simulacrum commented Oct 26, 2019

bors commented Oct 26, 2019

bors commented Oct 26, 2019

rust-highfive commented Oct 26, 2019

bors commented Oct 26, 2019

kennytm commented Oct 26, 2019

bors commented Oct 26, 2019

bors commented Oct 26, 2019

Mark-Simulacrum commented Oct 22, 2019 •

edited

Loading